Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Плащик для ОСЩ #181

Closed
wants to merge 39 commits into from
Closed

Плащик для ОСЩ #181

wants to merge 39 commits into from

Conversation

pxc1984
Copy link
Contributor

@pxc1984 pxc1984 commented Jul 7, 2024

Кратное описание

По какой причине

Медиа(Видео/Скриншоты)

Проверки

  • Я не требую помощи для завершения PR
  • Перед выкладыванием/запросом о рассмотрении PR, Я проверил работоспособность изменений.
  • Я добавил скриншоты/видео изменений, или данный PR не меняет внутриигровые механики

Changelog

pxc1984 and others added 30 commits June 11, 2024 11:47
@pxc1984
added blueshield
f3412a9
@pxc1984
added blueshield to sunrise maps
2cfe060
@pxc1984
Merge branch 'master' into blueshield
c483892
@VigersRay
Добавил токен для update_changelog.yml
851e34b
@VigersRay
Merge remote-tracking branch 'origin/master'
151f906
@VigersRay
пустой комит
1b43f31
@VigersRay
Тест авточейнжлога (space-sunrise#69)
8b391a0
@VigersRay
пустой коммит 2
b6f16dd
@VigersRay
Test changelog (space-sunrise#70)
9b8c40d 
* пустой комит

* пустой коммит 2
@VigersRay
update update_changelog.yml
fad83e5
@VigersRay
Test changelog (space-sunrise#71)
195b8f2 
* пустой комит

* пустой коммит 2

* update update_changelog.yml
@VigersRay
update update_changelog.yml
4521fa2
@VigersRay
Merge branch 'refs/heads/master' into test_changelog
014aabb 
# Conflicts:
#	.github/workflows/update_changelog.yml
@VigersRay
Test changelog (space-sunrise#72)
a298410 
* пустой комит

* пустой коммит 2

* update update_changelog.yml

* update update_changelog.yml
@VigersRay
update update_changelog.yml
8064920
@VigersRay
Merge branch 'refs/heads/master' into test_changelog
876a2e1 
# Conflicts:
#	.github/workflows/update_changelog.yml
@VigersRay
Test changelog (space-sunrise#73)
e228ae1 
* пустой комит

* пустой коммит 2

* update update_changelog.yml

* update update_changelog.yml

* update update_changelog.yml
@VigersRay
попробуем так...
d099409
@VigersRay
Merge branch 'refs/heads/master' into test_changelog
d2440bd 
# Conflicts:
#	.github/workflows/update_changelog.yml
@VigersRay
Test changelog (space-sunrise#74)
11b2528 
* пустой комит

* пустой коммит 2

* update update_changelog.yml

* update update_changelog.yml

* update update_changelog.yml

* попробуем так...
@VigersRay
Merge branch 'refs/heads/master' into test_changelog
532939e
@VigersRay
как же я заебался
48a40aa
@VigersRay
Test changelog (space-sunrise#75)
a853680 
* пустой комит

* пустой коммит 2

* update update_changelog.yml

* update update_changelog.yml

* update update_changelog.yml

* попробуем так...

* как же я заебался
@VigersRay
ДА СУКА
c9f8976
@VigersRay
Merge branch 'refs/heads/master' into test_changelog
742cf7d
@VigersRay
Test changelog (space-sunrise#76)
0246e35 
* пустой комит

* пустой коммит 2

* update update_changelog.yml

* update update_changelog.yml

* update update_changelog.yml

* попробуем так...

* как же я заебался

* ДА СУКА
@VigersRay
Update update_changelog.yml
1030166
@VigersRay
Merge branch 'refs/heads/master' into test_changelog
3a26092
@VigersRay
ну ради бога
c91fe67
@VigersRay
Merge branch 'refs/heads/test_changelog' into VigersRay-patch-3
e750854 
# Conflicts:
#	.github/workflows/update_changelog.yml
VigersRay and others added 9 commits June 12, 2024 18:26
@VigersRay
Update update_changelog.yml (space-sunrise#77)
99e2bcf 
* пустой комит

* пустой коммит 2

* update update_changelog.yml

* update update_changelog.yml

* update update_changelog.yml

* попробуем так...

* как же я заебался

* ДА СУКА

* Update update_changelog.yml

* ну ради бога
@VigersRay
пустой комит
9825cf2
@VigersRay
Vigers ray patch 3 (space-sunrise#78)
bb8b1e0 
* пустой комит

* пустой коммит 2

* update update_changelog.yml

* update update_changelog.yml

* update update_changelog.yml

* попробуем так...

* как же я заебался

* ДА СУКА

* Update update_changelog.yml

* ну ради бога

* пустой комит
@VigersRay
Update update_changelog.yml
532baa3
@VigersRay
Merge branch 'refs/heads/VigersRay-patch-3'
24837c9 
# Conflicts:
#	.github/workflows/update_changelog.yml
@pxc1984
review changes fix
020236a 
fixed backpacks
Fixed hardsuit
added blueshield locker
added blueshield's things to all sunrise maps
@pxc1984
Merge branch 'master_shit' into blueshield
9f2727b
@pxc1984
Теперь X-01 у ОСЩ, и цель у предателей на него
e6a6b96
@pxc1984
review changes fix
a2398b2
@pxc1984 pxc1984 requested a review from VigersRay as a code owner July 7, 2024 15:59
@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Jul 7, 2024

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@pxc1984 pxc1984 closed this Jul 7, 2024
@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Jul 7, 2024

RSI Diff Bot; head commit a2398b2 merging into 1a99508
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/_Sunrise/Clothing/Back/Backpacks/blueshield.rsi

State Old New Status
equipped-BACKPACK Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/_Sunrise/Clothing/Back/Duffels/blueshield.rsi

State Old New Status
equipped-BACKPACK Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/_Sunrise/Clothing/Back/Satchels/blueshield.rsi

State Old New Status
equipped-BACKPACK Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/_Sunrise/Clothing/Belt/blueshield_webbing.rsi

State Old New Status
equipped-BELT Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/_Sunrise/Clothing/Eyes/Glasses/blueshield_sunglasses.rsi

State Old New Status
equipped-EYES Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/_Sunrise/Clothing/Head/Hats/blueshield.rsi

State Old New Status
equipped-HELMET-hamster Added
equipped-HELMET Added
icon Added

Resources/Textures/_Sunrise/Clothing/Head/hardsuits/blueshield.rsi

State Old New Status
icon-flash Added
icon Added
inhand-left Added
inhand-right Added
off-equipped-HELMET Added
on-equipped-HELMET Added

Resources/Textures/_Sunrise/Clothing/OuterClothing/Armor/blueshield.rsi

State Old New Status
equipped-OUTERCLOTHING Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/_Sunrise/Clothing/OuterClothing/hardsuits/blueshield.rsi

State Old New Status
equipped-OUTERCLOTHING Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/_Sunrise/Clothing/Shoes/Boots/blueshield.rsi

State Old New Status
equipped-FEET-digi Added
equipped-FEET Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/_Sunrise/Clothing/Uniforms/Jumpskirt/blueshield.rsi

State Old New Status
equipped-INNERCLOTHING-monkey Added
equipped-INNERCLOTHING Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/_Sunrise/Clothing/Uniforms/Jumpsuit/blueshield.rsi

State Old New Status
equipped-INNERCLOTHING-digi Added
equipped-INNERCLOTHING-monkey Added
equipped-INNERCLOTHING Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/_Sunrise/Interface/Misc/job_icons.rsi

State Old New Status
BlueShield Added

Resources/Textures/_Sunrise/Markers/jobs.rsi

State Old New Status
blueshield Added

Resources/Textures/_Sunrise/Objects/Misc/id_cards.rsi

State Old New Status
idblueshield Added
silver-inhand-left Added
silver-inhand-right Added
silver Added

Resources/Textures/_Sunrise/Objects/pda.rsi

State Old New Status
equipped-BELT Added
equipped-IDCARD Added
id_overlay Added
inhand-left Added
inhand-right Added
insert_overlay Added
light_overlay Added
pda-blueshield Added

Resources/Textures/_Sunrise/Structures/Storage/closet.rsi

State Old New Status
bssecure Added
bssecure_door Added
bssecure_open Added
generic Added
generic_door Added
generic_icon Added
generic_open Added
locked Added
sparking Added
unlocked Added
welded Added

@pxc1984 pxc1984 deleted the blueshield branch July 7, 2024 16:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@VigersRay VigersRay Awaiting requested review from VigersRay VigersRay is a code owner

Assignees
No one assigned
Labels
Changes: Sprites Merge Conflict No C# Status: Needs Review
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@pxc1984 @VigersRay